Minor "improvements"