Include changes missing in previous commit