fix compilation problems and a runtime issue (Samuel Thibault)
fix compilation problems and a runtime issue (Samuel Thibault)

rpavlik/chromium,rpavlik/chromium,rpavlik/chromium,rpavlik/chromium,rpavlik/chromium