Fixes for PAN Data Type