Fixes import errors in wallet