Fix minor warnings

- Fix various warnings