Fixes static factory methods