bugfixes that should have been checked in weeks ago