Mods to avoid uninitialised variable errors