FIXED: Some fixes.