Misc E-stop fixes