Cleanup and s32 scenario fix (to CAPS5 instead of CAPS3)