Some extra fixes.