2 little fixes for backward compatibility with old WB modules