Some new alternatives and fixes