bug fixes post-merge
bug fixes post-merge

lyw07/kolibri,learningequality/kolibri,mrpau/kolibri,indirectlylit/kolibri,mrpau/kolibri,indirectlylit/kolibri,mrpau/kolibri,indirectlylit/kolibri,lyw07/kolibri,mrpau/kolibri,indirectlylit/kolibri,learningequality/kolibri,lyw07/kolibri,lyw07/kolibri,learningequality/kolibri,learningequality/kolibri