Fixed more abstract interpretation warnings