Official arrested Make fixes