Fix componentloader compat