Minor updates trying to get it to work...