AID-599: Back to absolute paths