Lint/warning fixes