Minor bug fixes
Merge remote-tracking branch 'origin'