Fixes to avoid conflicts with Gamma build and run system