Fix minor bugs
Merge remote-tracking branch 'origin'