+ Minor fixes