Fixing build for real