[FIX] Fixed problems encountered during Wisebed tests