Fix other build errors