Fixing some undefined