Small fixes for Start.