Added some more static guard stuff