Various fixes
Typo fixes
Update utilities