Modifications to align with gui runs