Couple extra fixes.