Fixed some final TODOs

Signed-off-by: Bogdan PURCĂREAŢĂ <bogdan.purcareata@cti.pub.ro>