Cleanup base-modal to ensure required properties are always setup