FileCount, a couple bug fixes