Fixing stuff during the workshop :D