Further bug fixes related to AP semester