Fixes comments from @sbinet