More sweeping fixes