Fixed one issue and verified build is working