Minor fixes, less styling assumptions.