bug/lint fixes