fix up things