More trial bug fixes