some fixes around