Fixed all undefined items