Mended some forgotten edge cases