Few modification to reduce compiler warnings