Fixes from Ariel