Various smaller fixes.