IMPLEMENTATION: Minor fixes

Signed-off-by: Gama <misept.dieseneuf@gmail.com>