Fix problems in late_command