some fixes before publish