Small Code updates

Some small code updates