Fixes from bug bash