Fix minor issues causing build errors