Minor api changes