Fixes for ~ home dirs and peps.