batch of temp fixes