Resolving issues with latest merge