Fix fields and stuff