Fixed several static methods.