Fix custom build commands