Small minor improvements.