Fix paths and descriptions