Compatibility update, everything just works