Added some support for static constructors, fixed %