Fixes for tickets