Minor updates - should be ready to run when needed