small fixes in case of public course