Fix datatypes for bug 503