Finally done with fixes