Added couple of cases which had been forgotten from compiling.
Fixed one heuristics that tries to resolve if memory access is safe to be more strict.