Fixed issues with static methods not working.