Fixes for compile process