Fix orpjaned lines, fix loading of source then plan errors.