More updates for Lantern
More Lantern fixes
More Lantern-related fixes