Make sure we start on boot
Flake fixes