Fix paths and add analytics