Fixed manifest and build file