Fixed the populate methods (due to a mis-understanding of how they work)