[16] 2 small changes