Fixing tslint errors
Fixing more tslint errors