Fixed various constant reassignments