Small fixes based on rpmlint report