Fix enabling and running