Fix various issues after merge

 * Add missing VT resources and fix compilation due to typo

Change-Id: I327e08c669f8b05280c020f1fd90d87149314472