Further fixes to part 2