Add more static checks