Fixing some consistency issues