Minor optimizations to keep from always going to the network