Fix broken values & undisable warning