Fix for fields ; More constants