Couple fixes for thumbnail issue - problem was still occuring in 1.8.4

Also changed try count to only 1 time, was making 2 attempts