Adding some sample fixes.