updates to better support mac