Fixing last bugs from the home.sh