Some warning fixed