Small initial changes to Vici.Core to fix compile issues.