Use a proper and less naive path do home directory
Misc changes in control files