Bug fixes in css wrapper