Started to play around with VM stuff, fixed a few things as a result.