Minor technical updates