Fixes to gloo to make it work with new API