do some fixes