Fixed Some more files that were not building