Fix dereferencing issues