Prepare.sh tweaks