Fixing some more build issues