Daedulus new fixes merge