small adjustments to recent api changes