Course block check related changes