diff --git a/bin/oref0-pump-loop.sh b/bin/oref0-pump-loop.sh
index a0b956978..2d93dd28c 100755
--- a/bin/oref0-pump-loop.sh
+++ b/bin/oref0-pump-loop.sh
@@ -256,11 +256,13 @@ function smb_reservoir_before {
     echo -n " is within 90s of current time: " && date +'%Y-%m-%dT%H:%M:%S%z'
     if (( $(bc <<< "$(to_epochtime $(cat monitor/clock-zoned.json)) - $(epochtime_now)") < -55 )) || (( $(bc <<< "$(to_epochtime $(cat monitor/clock-zoned.json)) - $(epochtime_now)") > 55 )); then
         echo Pump clock is more than 55s off: attempting to reset it and reload pumphistory
-	# Check for bolus in progress and issue 3xESC to back out of pump bolus menu
+        # Check for bolus in progress and issue 3xESC to back out of pump bolus menu
         smb_verify_status \
         && try_return mdt -f internal button esc esc esc 2>&3 \
         && oref0-set-device-clocks
-       fi
+        echo "Checking system clock against pump clock:"
+        oref0-set-system-clock
+    fi
     (( $(bc <<< "$(to_epochtime $(cat monitor/clock-zoned.json)) - $(epochtime_now)") > -90 )) \
     && (( $(bc <<< "$(to_epochtime $(cat monitor/clock-zoned.json)) - $(epochtime_now)") < 90 )) || { echo "Error: pump clock refresh error / mismatch"; fail "$@"; }
     find monitor/ -mmin -5 -size +5c | grep -q pumphistory || { echo "Error: pumphistory-24h >5m old (or empty)"; fail "$@"; }
@@ -461,7 +463,7 @@ function refresh_after_bolus_or_enact {
         fi
         # refresh profile if >5m old to give SMB a chance to deliver
         refresh_profile 3
-	refresh_pumphistory_and_meal || return 1
+        refresh_pumphistory_and_meal || return 1
         # TODO: check that last pumphistory record is newer than last bolus and refresh again if not
         calculate_iob && determine_basal 2>&3 \
         && cp -up enact/smb-suggested.json enact/suggested.json \
diff --git a/bin/oref0-setup.sh b/bin/oref0-setup.sh
index dc28266c4..9ff07c5f7 100755
--- a/bin/oref0-setup.sh
+++ b/bin/oref0-setup.sh
@@ -347,7 +347,7 @@ if [[ -z "$DIR" || -z "$serial" ]]; then
         echocolor "Configuring for Explorer Board HAT. "
         ttyport=/dev/spidev0.0
         hardwaretype=explorer-hat
-	radiotags="cc111x"
+        radiotags="cc111x"
     elif is_edison; then # Options for Edison (Explorer Board is default)
         echo "What kind of hardware setup do you have? Options are:"
         echo "1) Explorer Board"
@@ -362,13 +362,13 @@ if [[ -z "$DIR" || -z "$serial" ]]; then
           *) echocolor "Yay! Configuring for Edison with Explorer Board. "; ttyport=/dev/spidev5.1; hardwaretype=edison-explorer; radiotags="cc111x";;
         esac
     elif is_pi; then # Options for raspberry pi, including Explorer HAT (default) if it's not auto-detected
-	echo "What kind of hardware setup do you have? Options are:"
-	echo "1) Explorer HAT"
-	echo "2) Radiofruit RFM69HCW Bonnet"
+        echo "What kind of hardware setup do you have? Options are:"
+        echo "1) Explorer HAT"
+        echo "2) Radiofruit RFM69HCW Bonnet"
         echo "3) RFM69HCW (DIY: SPI)"
         echo "4) TI Stick (SPI-connected)"
-	echo "5) Other radio (DIY: rfm69, cc11xx)"
-	read -p "Please enter the number for your hardware configuration: [1] " -r
+        echo "5) Other radio (DIY: rfm69, cc11xx)"
+        read -p "Please enter the number for your hardware configuration: [1] " -r
         case $REPLY in
           2) echocolor "Configuring Radiofruit RFM69HCW Bonnet. "; ttyport=/dev/spidev0.1; hardwaretype=radiofruit; radiotags="rfm69";;
           3) echocolor "Configuring RFM69HCW. "; hardwaretype=diy;;
@@ -1140,7 +1140,7 @@ if prompt_yn "" N; then
         echo xdrip-js selected as CGM, so configuring xdrip-js
         git clone https://github.com/xdrip-js/Logger.git $HOME/src/Logger
         cd $HOME/src/Logger            
-	sudo apt-get install -y bluez-tools
+        sudo apt-get install -y bluez-tools
         sudo npm run global-install
         touch /tmp/reboot-required
     fi
@@ -1253,20 +1253,20 @@ if prompt_yn "" N; then
         echo "i2c-dev" > /etc/modules-load.d/i2c.conf
         echo "Installing socat and ntp..."
         apt-get install -y socat ntp
-	echo "Installing pi-buttons..."
-	systemctl stop pi-buttons
-	cd $HOME/src &&	git clone git://github.com/bnielsen1965/pi-buttons.git
-	echo "Make and install pi-buttons..."
-	cd pi-buttons
-	cd src && make && sudo make install && sudo make install_service
-	# Radiofruit buttons are on different GPIOs than the Explorer HAT
-	if  [[ "$hardwaretype" =~ "radiofruit" ]]; then
+        echo "Installing pi-buttons..."
+        systemctl stop pi-buttons
+        cd $HOME/src && git clone git://github.com/bnielsen1965/pi-buttons.git
+        echo "Make and install pi-buttons..."
+        cd pi-buttons
+        cd src && make && sudo make install && sudo make install_service
+        # Radiofruit buttons are on different GPIOs than the Explorer HAT
+        if  [[ "$hardwaretype" =~ "radiofruit" ]]; then
             sed -i 's/17,27/5,6/g' /etc/pi-buttons.conf
-	fi
-	systemctl enable pi-buttons && systemctl restart pi-buttons
+        fi
+        systemctl enable pi-buttons && systemctl restart pi-buttons
         echo "Installing openaps-menu..."
-	cd $HOME/src && git clone git://github.com/openaps/openaps-menu.git || (cd openaps-menu && git checkout master && git pull)
-	cd $HOME/src/openaps-menu && sudo npm install
+        cd $HOME/src && git clone git://github.com/openaps/openaps-menu.git || (cd openaps-menu && git checkout master && git pull)
+        cd $HOME/src/openaps-menu && sudo npm install
         cp $HOME/src/openaps-menu/openaps-menu.service /etc/systemd/system/ && systemctl enable openaps-menu
     fi