Fix some build issues (still doesn't compile)