#389 Formal fixes