Context aware wall some fixes