Updates for embedded path bug