Fixes to merged branches