Miscelleous fixes and enhancements (e.g., prompt confirmation for destructive changes)