Fix issues raised during code review, weird characters