fix obvious bugs
Merge branch 'bug-fixes'