Fixes for our compiler scripts