More 0. fixes