Merged apFixIssue-gcc490 from repository apfeiffer1
fix follow-up issues of move to size_t