Minor improvements found while testing