Fixing tslint errors