Minor efficiance updates