Tech fixes