Record changes, small fixes