Few fixes after merging master into branch.