A few more minor prettifications