Add small fixes for legacy mode