Small issues / improvements.