Tweaked storage values in complex record types

Signed-off-by: Tom Wright <tom@inflatablecookie.com>