Fixed some issues; mostly Mac