Fixing some issues with build