fix shmem issues
merged