a couple of fixes, lint