Last review fixes