Various little improvements.