Shelter fix
Combat fix?