Small code improvements.