More aspectJ fixes