Mac fixes (for etanks/lives)

After testing, discovered some bugs (that were causing SEGFAULT and other non-recoverable errors). Fixed them up. Boom.