Fixed toggling constructors and utility methods