Lint fixing and minor bugs