Changes to allow correct frame lowering with latest changes