Some more basic changes.