Pegasusq tweaks

Change-Id: I2c8718a8d5bf14df52c28efe30607399dce8c1bf