minor fixes to base code