Various tidying after last nights shenanigans