Minor code updates