Other various Clientside changes