Fixing unwrap issues