Fixes, part 2.