Added fix based on https://prototype.lighthouseapp.com/projects/8886/tic...

See ticket https://prototype.lighthouseapp.com/projects/8886/tickets/3701

Hopefully some of these fixes can get into the next release @savetheclocktower Thanks!