! Error 8

Signed-off-by: John Rayes <live627@gmail.com>
Implement #2109

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2114 from live627/dev

A few random fixes