Fix a few bugs that were causing Runit failures