Add corrections to un-break the build