Fix issues so we can compile