more tweaks to make work under Gotham