Add fixes to work with/with-out X Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Jose Quaresma <quaresma.jose@gmail.com> Cc: Andreas Müller <schnitzeltony@gmail.com>