Fixes for new koding