Fix paths and output