3.2.53; more fixes

http://twitter.com/taviso/statuses/514887394294652929