Transitional bug fixes