More minor fixes to new files