Fix compile errors 2