Fixing remaining errors

--HG--
extra : source : 415c45d42050dfb92055fca30db6c92be8592d20