some fixes for backward compatibility with WB modules (tested with Bookings so far)