Minor optimizations.
Testing APIs!