Fixes related to comments on previous commit