Fix remaining errors with merge