Resolving some of the warnings