Fix Stage dependencies