New revamping fixes

Signed-off-by: Fred Bricon <fbricon@gmail.com>
more fixes

Signed-off-by: Fred Bricon <fbricon@gmail.com>