Committing all minor bug-fixes