a few smaller fixes