minor bugs fix