applied fixes that occurred during build