Bug fixes for boot.sh