Last fixes from Krista