Final integration fixup