FALCON-1940 Fix misc build issues in Falcon