some fixes I forgot