Start fixing errors