Patron no tips

Fixes #917 and #1469.