Fixes after review. Should be squashed with previous commit.