Some MISC fixes for posting to Nadias site