TSLint fixes