Some home fixes