Minor adjustments to everything