Random fixes

These have been lingering around on my branches for way too long :P