Few minor bugs