Set/get fixes, trying to get diskmap going.