Smaller design improvements