Some easy improvements