Fixes to pass all vows test.