Minor updates to associations