Fixes for building