small fixes to remove compiler warnings and remove of a .Record reference that won't work in 1.8 (thanks Skrypt)