fixes to various files