Fix obsolete commands