cleanup some static analysis warnings

Change-Id: I69ae5f2141aba983b23aa5cd0baa5f215e486811