Updates for new GlueStick API (thanks Will)