Fixes for build