fix up issues