resolve some consistency issues