Fix stage align settter and make shell tests pass again.