Fixes for the warnings