Small changes for new environment