Add some stuff, hopefully should reduce errors