Fixed up problems introduced while resolving merge conflicts