Fix project errors found by Faux Pas