Closed two more icarus bugs