Fixed key checks