Fixing build stuff