Tiny fixes for 2.5

Tiny tiny fixes I found while switching over my blog to 2.5.