Fix up bind and mount