more fixes

Change-Id: Ie4b04c7362fb7cab25530df0a693769e7aa56b33