Fixing constant types