Fixed files so that build succeedes