Reference updates and bug fixes