Fixed references to client, changed to poly meetable