Fixed previous commit build errors