More random fixes for things that were inconvenient at some random moment, likely.