minor bugs from prev changes