critical bug fixes