Further tweaks for SRAMP-388