Fixed locality issues