some init hooks fixes