Fixed issues with record keeping