Upgrade fixes

Fixing up tslint / compile complaints