Add pet peeve fixes #3