Fixing build issues, hopefully