Fixing inconsistent typing