Cleanup: Fix for missing default members