Fix several bugs in case of manual starting