Fixed more undefined property errors