Css bundler fixes

fixes for #660 and #658