couple of minor bugs