Minor adjusts