Fixing bugs and paths