+ fixes

Change-Id: If119104a193cf9024d0a57b8ce643d46d0ab8362