A few smaller fixes