Fixes from home