post-drunk fixes