Minor updates after testing