A few smaller fixes.