Fixing some undefined/"" errors