Fixed issues near Record.h