Android Client Small Fixes