Minor fixes. Merge with master