Misc changes

Nonsensical, really.