merge fixes from knockknock