Some more small varuable fixes