Some little improvements.