cleaned some warnings away