Some small changes and fixes for Gotham