Fixes from gotham