Push small fixes for external mode