A couple more style changes