+ Minor improvements