Clean up aliases, add a few more