Eliminating several runtime warnings

:warning::see_no_evil: