Close #49 and fix regressions found during verification