WIP: Fixed compiler errors, test crashes