Small change to compile the code.
A bit more changes to fix custom records and update to Release Candidate 3