Code updates

Various code updates