Integrated recommended changes, fixed build