Fixes for benongs_to associations