Remove zeros: various fixes