demonstrator marking fixes