More well3 fixups.