Minor fixes
Resolve merge from kbasten