fixes to get things to work