Few bugs that slipped through the cracks on humongous update.