Minor improvements

Just some minor convenience things.