More fixes for rpnesil