Fixed broken files. It will compile, woho!