Fix ctor visibility
Compiler warnings re: goto skipping stuff