some fixes before re7