More fixes in home