Multiple commits: Mainly fixes