Fixes for latest gin api changes