Fixed association issues