Address FindBugs warnings

Curious about this one? I guess it's the lack of synchronization we're fixing here..?