Few Wall fixes