Important bug fixes for stuff introduced in refactoring