Fixed remaining unpack issues