Cleanup problems introduced by BS3 update.