Some warning fixed.