Cosmetics
Fixes #1235