fixups

* fix by @robert-chiniquy