v2.0: fixed some warnings