More tweaks and for/try fixes