Fixes for right/typo