Added more fixes for Tower.