Fix warnings and something else.