"Misc fixes"