Fixed more warnings… TODO: it still does not compile (warnings treated as errors)