Bug fixes for bug fixes

Fixing fixes that undfixed fixed things