Fixes against warnings via vint