Attempted to fix the compile issues, but that didn't really happen.