Final fix - all cases should work.
Fix the remaining issues.