Minor fixes to controller-client side interaction.