Fixes for issues found my Armageddon Monkey