Some fixes.