M: Fix when file picker cancelled
M: PEPing, cleaning