fixes for tickets found in sprint 60