Pushed from Mac Issues Resolved

Signed-off-by: Andrew Kostuik <adk@andrewkostuik.com>