Minor improvements #2