Various action menu fixes