VE: Minor fixes so all the lint/hint checks are passing