Minor fixes based on clean env testing