Sort out initial errors (test v1)