some fixes III