fixing some more checks