Fixes from Post comments