Made several fixes and adjustments to AliasCmdExecutor