Fix css dumping & condition scope