Default Changes, +other minor