Fixes for 'make lint'