Quick fixes for the client controller