findbugs fixes, inc Stack -> Deque