Fixes from Saucy testing