CODE: Minor updates