minor adaptions in imports