fixes for simon