Fix: Elimination of compiler warnings