some fixes in init