Various fixes and updates for Lightning support
Various fixes and updates for Lightning support