Fixing some issues found by Robotium Testing