Lint check fixes