Minor fixes after review and daily usage.