Mac fixes, removed warning

Fixed warning. Fixed more Mac issues.