Fixed more constants and datatypes