Fixed join table field types