vigor: fixes for 4.3

Change-Id: Ie9e0d29e79878f526c881449c7c954eb7d93aca9