004: fix integration issues