Minor cleanups. Preparing v0.7.0.3