Fix last(?) batch of malloc-NULL places