Some fixes in clear all