small bug fixes to last push