Fixing more tslint errors