act: fix some edge cases