More minor fixes and cleanup from merge