Fixed #104 along with a few other POI quirks