More fixing errors