Small fixes updated during filesystem crash and update to my latest prezto fork
Cleanup after btrfs fs crash