Cleanup warnings on gcc