Fixing up custom types