post-liz draft fixes