Fixes for amd <> worker