Many2Many POJO generation fixes