Trying to fix the build errors