Fixes for ASKAP build