[Added] some fixes.