Multiple typo and bug fixes

Fixes are in the commits

Resolves #4295 
Resolves #4296