Changes to remove compiler warnings

Made changes to datatypes to remove compiler warnings.