Multiple fixes, now using legacy