Some minor "improvements"