Fixes against errors/warnings via vint