Some other fixes

Signed-off-by: Julien Blatecky <julien1619@gmail.com>