Fixing build process