Fix some broken methods, handle the use case of static objects