Some L&F Fixes