Merge "Miscellaneous minor fixes"