Fix init command handling