Analyzers Fix

Do we really need all this?