Fixes for lints.