Fix a couple of small bugs with the free ticket system
Merge bugfixes from master