Fix extra blank lines various places