Fixing build process :shipit: