Fixes for handing in