typename usage on gcc
Mac fixes
Removing cruft