Last fixes to get original setup working.