Minor big fixes. Returnig to dev on 1.4.7

Signed-off-by: Nauthul <axel.evain@gmail.com>