some fixes to properly enable static modals