Added some bug fixers?