Fix syntax errors in modularised startup