Fixes minor bugs in #A