Adding more sane defaults