Cleanups and added missing aliases