Fixed some size optimization issues on x11.