Fixes for typo and suggestion