some fixes. It's RC