small fixes to cleanup warnings