Bringing in the rest of spencer's zero fill changes