Few changes to silent the warnings