Minor merge changes