Fix some minor quirks