replaced M$-only types with standard integer types