Fixed some undefined's