fixed issues introduced after smuggler api changes