Small tweaks before attempting adding Games model