Fixes legacy builds