More updtes for better WebLaF support