Updated to reflect OS specific issues