Minor fixes for improved interface.