Fix various initial errors