Fixes from Gilbert's Model