minor changes to the WithinModal impl