Potential memspace collisions fixed