fix compiler warnings/errors reported by Robert White

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>