Attempt to fix some wordsize issues.