cleaned some warnings