verified code fixes