Fixing issues with x11 build.