Some updates and warn fix
Small fix