More tweaks to geiser