Two small fixes for issue #25