Fixing a couple of differences between complete and start