Fixes to allow for multiple modal instances