Fix errors and add packages