Fixing typecasts...