Fix some confusing code noticed by unknown, typo fix