Fix compile errors 3