Various smaller changes