Various fixes about implementation