Less verbose and fixes