Fix warnings

Fix various warnings