Fixes from gotham version