Fixes for auto update returning incorrect response. Fix for possible infinite loop situation.