Fix some sqlite conversion issues due to commit.