Remove some small BUGS

Change-Id: I8e0a939a66e0b5313e5648972d7f97e24a416f21