Finished(?) hotfixes for CS course