Fix paths and highlighting