Make some initial tweaks