Few fixes

Corrected some errors while moving data. There are many logs that need
to be removed, but for now we can just let them where they are :-)