Fix raw associations