some temp fixes