TSLint errors solved