Minor fixes
Merged with previous changes