Minor changes to clientsideclasses