Fixes from running branch against real code