more small fixes from @briancavalier