Pulled from ersky9x
Cosmetics
Fixes #1316