even more critical bug fixes