Various fixes to s-ramp demos (prep for release)