various fixes

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