A few minor package fixes for SCL compatibility