several fixes because of deleted files