bug fixes

Change-Id: I0279d881fd41b903dbab9882908b6ee12546ebc8