Polishing and fixes