Better handling of base adapters; updated to latest IC commit