Small DataWindow improvements