- Minor fixes according to @wallyworld observations