Various fixes for UserVoice