Fixed the warnings