Fix some issues so testing can procede