Fixed things that were brought up in PR comments