Fix some omissions