More tweaks to making it work