Live Plugin Fixes after Technical Testing

Live Plugin Fixes after Technical Testing