Tidied warnings