Several small changes just as a shim to get everything to work.

Signed-off-by: Simo Leone <simo@archlinux.org>