Updated a few things for new legacy source to work properly