Various updates to shrc_common