Styling bug fixes, adapted to new IDE configuration