Fixing table definations