Fixed build issues
Fixed more build issues