fix froyo crash issue, lint warnings