Merged in runit-fixes into base-fixes