Add more syntastic validations