Fixed static vs non-static class issues.