Gotham compatibility changes