fixes regarding NodeBB/NodeBB#1591