Jorge's fixes