small changes to make it less broken