Constants POD tweak