Various cleanup based on PR comments