Polish support loose ends (#107)