Disable discard of locked file

Also enhanced display of locked files