Fixing up some issues with MetaSpec 0x54