More unwrap refactions, fix