Merging several fixes to production