Changed Int32 -> Int and fixed one undef'd fn.