Fixed: More compiler warnings (unused local variables)