Second iteration fixes