Debug

Fixing random, misc compile errors.