#386 Fixing some formal issues