[Mild fixes to remove compile errors]