Cleaned some warnings