Some small fixes after merging branch master