Last minute fixes based on empirical studies result