Small fixes, remove zeroing rule