Fixes (1) and (3) in #12