fix some variance issues