more tweaks to ensure we run right environment