Fix some warnings instead of suppressing them