fix
Fixes to modal popup warning