commit: fix two buglets