minors tweaks to be more platform agnostic