More real world fixes. Need to still unit test