fix tubby move integration bugs