small work-in-progress fixes