Some miscellaneous fixes to interface adherance