Fix typos, add safety aliases