Finished with fixes