C-c a: fixed a couple of bugs