Updated versions, fixed includes