Minor updates & logging