Fixes for CSS