squished bug fixes

Change-Id: Icb2dc5f5b21942b70b9934b75856ffc6a0030f27