Fix Home creation (#5)