Pathes and fixes for tough-cookie repo