Two Errors

Two errors in less than an hour! This is a brilliant start.
Merge branch 'hotfix' into development