Misc. warnings corrections